[IA64] revert xen-ia64-unstable.hg cset 11039

No longer necessary with xencomm

Signed-off-by: Kouya Shimura <kouya@jp.fujitsu.com>

diff --git a/xen/arch/ia64/xen/vcpu.c b/xen/arch/ia64/xen/vcpu.c
index fdf7b6c8a5c223ce845ac744acae625e8cabf5e0..c27d5184497c048b425de53850bc375c5c70f4cd 100644 (file)
--- a/xen/arch/ia64/xen/vcpu.c
+++ b/xen/arch/ia64/xen/vcpu.c
@@ -2226,28 +2226,3 @@ IA64FAULT vcpu_ptr_i(VCPU *vcpu,UINT64 vadr,UINT64 log_range)
 
        return IA64_NO_FAULT;
 }
-
-int ia64_map_hypercall_param(void)
-{
-       struct vcpu *v = current;
-       struct domain *d = current->domain;
-       u64 vaddr = v->arch.hypercall_param.va & PAGE_MASK;
-       volatile pte_t* pte;
-
-       if (v->arch.hypercall_param.va == 0)
-               return FALSE;
-       pte = lookup_noalloc_domain_pte(d, v->arch.hypercall_param.pa1);
-       if (!pte || !pte_present(*pte))
-               return FALSE;
-       vcpu_itc_no_srlz(v, 2, vaddr, pte_val(*pte), -1UL, PAGE_SHIFT);
-       if (v->arch.hypercall_param.pa2) {
-               vaddr += PAGE_SIZE;
-               pte = lookup_noalloc_domain_pte(d, v->arch.hypercall_param.pa2);
-               if (pte && pte_present(*pte)) {
-                       vcpu_itc_no_srlz(v, 2, vaddr, pte_val(*pte),
-                                        -1UL, PAGE_SHIFT);
-               }
-       }
-       ia64_srlz_d();
-       return TRUE;
-}

diff --git a/xen/include/asm-ia64/domain.h b/xen/include/asm-ia64/domain.h
index b93351c63cadfe52254828fbd0380f84e75d23b2..99cfa7415e97e53173e294f9f1cdfe7b1c248ac0 100644 (file)
--- a/xen/include/asm-ia64/domain.h
+++ b/xen/include/asm-ia64/domain.h
@@ -142,12 +142,6 @@ struct arch_domain {
     (sizeof(vcpu_info_t) * (v)->vcpu_id + \
     offsetof(vcpu_info_t, evtchn_upcall_mask))
 
-struct hypercall_param {
-    unsigned long va;
-    unsigned long pa1;
-    unsigned long pa2;
-};
-
 struct arch_vcpu {
     /* Save the state of vcpu.
        This is the first entry to speed up accesses.  */
@@ -192,8 +186,6 @@ struct arch_vcpu {
     char irq_new_condition;    // vpsr.i/vtpr change, check for pending VHPI
     char hypercall_continuation;
 
-    struct hypercall_param hypercall_param;  // used to remap a hypercall param
-
     //for phycial  emulation
     unsigned long old_rsc;
     int mode_flags;

diff --git a/xen/include/asm-ia64/uaccess.h b/xen/include/asm-ia64/uaccess.h
index 17e2a17f9d71fc7c66d705db4c768214ec34f187..32ef4151dfc4b2b86a9cdf923ed7971fdcf215f3 100644 (file)
--- a/xen/include/asm-ia64/uaccess.h
+++ b/xen/include/asm-ia64/uaccess.h
@@ -211,30 +211,16 @@ extern void __put_user_unknown (void);
 extern unsigned long __must_check __copy_user (void __user *to, const void __user *from,
                                               unsigned long count);
 
-extern int ia64_map_hypercall_param(void);
-
 static inline unsigned long
 __copy_to_user (void __user *to, const void *from, unsigned long count)
 {
-       unsigned long len;
-       len = __copy_user(to, (void __user *)from, count);
-       if (len == 0)
-               return 0;
-       if (ia64_map_hypercall_param())
-               len = __copy_user(to, (void __user *)from, count); /* retry */
-       return len;
+       return __copy_user(to, (void __user *)from, count);
 }
 
 static inline unsigned long
 __copy_from_user (void *to, const void __user *from, unsigned long count)
 {
-       unsigned long len;
-       len = __copy_user((void __user *)to, from, count);
-       if (len == 0)
-               return 0;
-       if (ia64_map_hypercall_param())
-               len = __copy_user((void __user *) to, from, count); /* retry */
-       return len;
+       return __copy_user((void __user *)to, from, count);
 }
 
 #define __copy_to_user_inatomic                __copy_to_user